iconview: Respect item width in size requestr code
authorBenjamin Otte <otte@redhat.com>
Sun, 6 May 2012 01:21:18 +0000 (03:21 +0200)
committerBenjamin Otte <otte@redhat.com>
Sun, 6 May 2012 22:12:26 +0000 (00:12 +0200)
gtk/gtkiconview.c

index f4cfe9a370a34680dbf148a8d0db220830f3ad62..d06f6af60ebad809cda61ccc80ac84b313898b25 100644 (file)
@@ -1451,6 +1451,14 @@ gtk_icon_view_get_preferred_item_size (GtkIconView    *icon_view,
 
   cell_area_get_preferred_size (icon_view, context, orientation, for_size, minimum, natural);
 
+  if (orientation == GTK_ORIENTATION_HORIZONTAL && priv->item_width >= 0)
+    {
+      if (minimum)
+        *minimum = MAX (*minimum, priv->item_width);
+      if (natural)
+        *natural = *minimum;
+    }
+
   if (minimum)
     *minimum += 2 * priv->item_padding;
   if (natural)